Bug 575700 - Crash when moving a GtkWindow

2009-03-17  Tor Lillqvist  <tml@novell.com>

	Bug 575700 - Crash when moving a GtkWindow

	* gdk/win32/gdkevents-win32.c (gdk_event_translate): Fix
	embarrassing crasher bug introduced on 2009-03-11. A variable was
	assigned a value only inside a GDK_NOTE but still used outside
	that.

svn path=/trunk/; revision=22568

diff --git a/ChangeLog b/ChangeLog
index 3166e5531588869908df1b381c54a02969f7e82d..aac290f2d94c5efc8fbd086c96990d808c92f21f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2009-03-17  Tor Lillqvist  <tml@novell.com>
+
+       Bug 575700 - Crash when moving a GtkWindow
+
+       * gdk/win32/gdkevents-win32.c (gdk_event_translate): Fix
+       embarrassing crasher bug introduced on 2009-03-11. A variable was
+       assigned a value only inside a GDK_NOTE but still used outside
+       that.
+
 2009-03-17  Tor Lillqvist  <tml@novell.com>
 
        * gtk/gtkprintoperation-win32.c: Newer mingw-w64 uses an

diff --git a/gdk/win32/gdkevents-win32.c b/gdk/win32/gdkevents-win32.c
index b37fec325a36765b31a13e90d113f6819c919921..3cdd66f0e11c0c23f893e87b240630d5cb58ff3f 100644 (file)
--- a/gdk/win32/gdkevents-win32.c
+++ b/gdk/win32/gdkevents-win32.c
@@ -3253,16 +3253,16 @@ gdk_event_translate (MSG  *msg,
       break;
 
     case WM_WINDOWPOSCHANGED:
-      GDK_NOTE (EVENTS, (windowpos = (WINDOWPOS *) msg->lParam,
-                        g_print (" %s %s %dx%d@%+d%+d",
-                                 _gdk_win32_window_pos_bits_to_string (windowpos->flags),
-                                 (windowpos->hwndInsertAfter == HWND_BOTTOM ? "BOTTOM" :
-                                  (windowpos->hwndInsertAfter == HWND_NOTOPMOST ? "NOTOPMOST" :
-                                   (windowpos->hwndInsertAfter == HWND_TOP ? "TOP" :
-                                    (windowpos->hwndInsertAfter == HWND_TOPMOST ? "TOPMOST" :
-                                     (sprintf (buf, "%p", windowpos->hwndInsertAfter),
-                                      buf))))),
-                                 windowpos->cx, windowpos->cy, windowpos->x, windowpos->y)));
+      windowpos = (WINDOWPOS *) msg->lParam;
+      GDK_NOTE (EVENTS, g_print (" %s %s %dx%d@%+d%+d",
+                                _gdk_win32_window_pos_bits_to_string (windowpos->flags),
+                                (windowpos->hwndInsertAfter == HWND_BOTTOM ? "BOTTOM" :
+                                 (windowpos->hwndInsertAfter == HWND_NOTOPMOST ? "NOTOPMOST" :
+                                  (windowpos->hwndInsertAfter == HWND_TOP ? "TOP" :
+                                   (windowpos->hwndInsertAfter == HWND_TOPMOST ? "TOPMOST" :
+                                    (sprintf (buf, "%p", windowpos->hwndInsertAfter),
+                                     buf))))),
+                                windowpos->cx, windowpos->cy, windowpos->x, windowpos->y));
 
       /* If position and size haven't changed, don't do anything */
       if (_sizemove_in_progress &&